Actually count the cached icons. (#135888, Crispin Flowerday)

Sun May  9 01:25:37 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkiconfactory.c (add_to_cache): Actually count the
	cached icons.  (#135888, Crispin Flowerday)

diff --git a/ChangeLog b/ChangeLog
index 48b78e78e24d05d29804e380feb1db2111117a77..934994bba468152a4bdd1d37ff0b6d611820e2e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May  9 01:25:37 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (add_to_cache): Actually count the
+       cached icons.  (#135888, Crispin Flowerday)
+
 Sun May  9 00:03:03 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Make sure

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 48b78e78e24d05d29804e380feb1db2111117a77..934994bba468152a4bdd1d37ff0b6d611820e2e3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun May  9 01:25:37 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (add_to_cache): Actually count the
+       cached icons.  (#135888, Crispin Flowerday)
+
 Sun May  9 00:03:03 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Make sure

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 48b78e78e24d05d29804e380feb1db2111117a77..934994bba468152a4bdd1d37ff0b6d611820e2e3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun May  9 01:25:37 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (add_to_cache): Actually count the
+       cached icons.  (#135888, Crispin Flowerday)
+
 Sun May  9 00:03:03 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Make sure

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 48b78e78e24d05d29804e380feb1db2111117a77..934994bba468152a4bdd1d37ff0b6d611820e2e3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun May  9 01:25:37 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (add_to_cache): Actually count the
+       cached icons.  (#135888, Crispin Flowerday)
+
 Sun May  9 00:03:03 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Make sure

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index b75db0097f1a9722231bc5becbc10698f338b673..b1accbc0069bae1520878a2b53c2c1f6a578c6cf 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -2600,7 +2600,7 @@ add_to_cache (GtkIconSet      *icon_set,
   CachedIcon *icon;
 
   ensure_cache_up_to_date (icon_set);
-  
+
   g_object_ref (pixbuf);
 
   /* We have to ref the style, since if the style was finalized
@@ -2610,10 +2610,10 @@ add_to_cache (GtkIconSet      *icon_set,
   
   if (style)
     g_object_ref (style);
-  
 
   icon = g_new (CachedIcon, 1);
   icon_set->cache = g_slist_prepend (icon_set->cache, icon);
+  icon_set->cache_size++;
 
   icon->style = style;
   icon->direction = direction;
@@ -2627,7 +2627,6 @@ add_to_cache (GtkIconSet      *icon_set,
   if (icon_set->cache_size >= NUM_CACHED_ICONS)
     {
       /* Remove oldest item in the cache */
-      
       GSList *tmp_list;
       
       tmp_list = icon_set->cache;